km/common: use u-boot.kwb for u-boot update function on arm

Now we use the standard u-boot make to build the Kirkwood binary.
The output file is u-boot.kwb. So use this name for the tftp
update function to avoid confusion, because this is the binary we
need on Kirkwood.

Signed-off-by: Holger Brunck <[email protected]>
cc: Valentin Longchamp <[email protected]>
cc: Heiko Schocher <[email protected]>
cc: Wolfgang Denk <[email protected]>

diff --git a/include/configs/km/keymile-common.h b/include/configs/km/keymile-common.h
index 6a31d265e7b9b4728f1c797655e9d1d99a21f522..d749b2bceaa1bcf54251f0184a275d4c4485d154 100644 (file)
--- a/include/configs/km/keymile-common.h
+++ b/include/configs/km/keymile-common.h
@@ -248,7 +248,6 @@
        "stderr=serial\0"                                               \
        "stdin=serial\0"                                                \
        "stdout=serial\0"                                               \
-       "u-boot="xstr(CONFIG_HOSTNAME) "/u-boot.bin\0"                  \
        ""
 #endif /* CONFIG_KM_DEF_ENV */
 

diff --git a/include/configs/km/km-powerpc.h b/include/configs/km/km-powerpc.h
index 4cec57cf3128634a7caa61f1ed0e371675613d9a..7610358d8ea468f20fa56e9b6a0ca3b6cbaa1416 100644 (file)
--- a/include/configs/km/km-powerpc.h
+++ b/include/configs/km/km-powerpc.h
@@ -75,6 +75,7 @@
                "cramfsload ${fdt_addr_r} "                             \
                "fdt_0x${IVM_BoardId}_0x${IVM_HWKey}.dtb\0"             \
        "fdt_addr_r=" xstr(CONFIG_KM_FDT_ADDR) "\0"                     \
+       "u-boot="xstr(CONFIG_HOSTNAME) "/u-boot.bin\0"                  \
        "update="                                                       \
                "protect off " xstr(BOOTFLASH_START) " +${filesize} && "\
                "erase " xstr(BOOTFLASH_START) "  +${filesize} && "     \

diff --git a/include/configs/km/km_arm.h b/include/configs/km/km_arm.h
index 23717f4cbd1cbed3547f6a7505f34cb6a485a463..d41fcb760eff32a0eecfe4be48fb38b9de4c1da3 100644 (file)
--- a/include/configs/km/km_arm.h
+++ b/include/configs/km/km_arm.h
@@ -74,6 +74,7 @@
 #define CONFIG_KM_DEF_ENV_CPU                                          \
        "boot=bootm ${load_addr_r} - -\0"                               \
        "cramfsloadfdt=true\0"                                          \
+       "u-boot="xstr(CONFIG_HOSTNAME) "/u-boot.kwb\0"                  \
        CONFIG_KM_DEF_ENV_UPDATE                                        \
        ""